bitkeeper revision 1.1389.19.4 (42833083E4kFA8A5tBgDNgF_X2CkBA)

Fix the x86/64 build. Patch based on one from Andrei Petrov.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c
index c8525bce642c997200bef10b5d89159d2990a264..99fc21b018cc1a1cbbda39589a99e92686c5a338 100644 (file)
--- a/xen/arch/x86/acpi/boot.c
+++ b/xen/arch/x86/acpi/boot.c
@@ -36,26 +36,13 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mpspec.h>
+#include <mach_apic.h>
+#include <mach_mpparse.h>
 
 int sbf_port;
 #define end_pfn_map max_page
 #define CONFIG_ACPI_PCI
 
-#ifdef CONFIG_X86_64
-
-static inline void  acpi_madt_oem_check(char *oem_id, char *oem_table_id) { }
-extern void __init clustered_apic_check(void);
-static inline int ioapic_setup_disabled(void) { return 0; }
-
-#else  /* X86 */
-
-#ifdef CONFIG_X86_LOCAL_APIC
-#include <mach_apic.h>
-#include <mach_mpparse.h>
-#endif /* CONFIG_X86_LOCAL_APIC */
-
-#endif /* X86 */
-
 #define BAD_MADT_ENTRY(entry, end) (                                       \
                (!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
                ((acpi_table_entry_header *)entry)->length != sizeof(*entry))